merge emacs-24
authorKenichi Handa <handa@gnu.org>
Thu, 6 Dec 2012 05:31:40 +0000 (14:31 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 6 Dec 2012 05:31:40 +0000 (14:31 +0900)

Trivial merge